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

Change-Id: I564cd4d2e9854113a2996e74bc6323926687e4c8