Merge "Unregister listeners and reset wake lock" into qt-dev
am: 9b47581ea4

Change-Id: I6c479e080905ca8a8dd2ffc036d384d5eb6d7d2e