Merge "Unregister listeners and reset wake lock" into qt-dev
am: 8dc0ab0aeb

Change-Id: I71c11779640c2c5174a36a088072dc5d222dcb35