Merge "Revert "Unregister listeners and reset wake lock"" into qt-dev