Merge "Merge "Revert "Unregister listeners and reset wake lock"" into qt-dev am: a5be2897 am: 5e6adcbf" into qt-r1-dev-plus-aosp