Merge "Unregister listeners and reset wake lock" into qt-r1-dev
am: 20a95a9029

Change-Id: I05a7e92d23176f09b077c8fb546f1c06265261ea