Merge "Merge "Revert "Unregister listeners and reset wake lock"" into qt-dev am: a5be28971c am: 9d75e2fd79" into qt-r1-dev-plus-aosp
am: 615b6cf5d7

Change-Id: I8bcec13e9549487a6f7c9a9e2da2c9f895492a52