Merge "Add tracing to InputManagerService"