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

Change-Id: Ia4a31feae0a9fe8a11c77dfa027e2a7045193539