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

Change-Id: Iad6510b72dbdc1f325d0a17baf846c6d89179a9b