Merge "Revert "Unregister listeners and reset wake lock"" into qt-dev am: a5be28971c
am: 5e6adcbfe7

Change-Id: I776d3c0853ad8d18723b31100acecba518f6e55f