[automerger skipped] Merge "Unregister listeners and reset wake lock" into qt-dev am: 8dc0ab0aeb -s ours
am: 0e45a2db5f -s ours
am skip reason: change_id I9bc993f372a8c05258f1778eb3d415af04544714 with SHA1 2d34523527 is in history

Change-Id: I68a3b8e9fdc69db880865f46e307a9a5c2b4c3f2