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

Change-Id: Ie7d45b61a1b6b2f31bb20c1ad4e6feaa43c33ce1