Merge "Clean fix for the chown race condition on new input devices."