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

Change-Id: I7cf114751ff0c2ae1f24301485a52052c42f53b7