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

Change-Id: I1a3ef5aa695206716d0aacc4010d12cd73550a8f