Merge "Revert "Finish input when the screen state is off"" into rvc-dev am: d99569f88a

Change-Id: Ic669aab90118da2093ddd1c5fb8e6efe77faa904