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

Change-Id: Ib0473ba82e1d5d503584a72011ddb659f7de82f3