Merge "Clean up warnings and fix improper locking in InputManagerService."