[automerger skipped] DO NOT MERGE: Revert Move startInput for WINDOW_FOCUS_GAIN to background thread am: 344858dd -s ours am: 87a31d58 Change-Id: I5f4dacc7e54f8182d7129494edc8f247a4e80d3b