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

Change-Id: I649e2774d8f08bf5a2ea666074b04fd22c69ff0f