Merge "Revert "Introduce SingleKeyGestureDetector to PhoneWindowManager"" into sc-dev