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