[automerger skipped] Merge "Unregister listeners and reset wake lock" into qt-dev
am:9b47581ea4-s ours am skip reason: change_id I227842d7272d1edeaa67d776950f369aedb01a91 with SHA12bc992decbis in history Change-Id: Ic38213cef426e9a808fa436b50119394e36ce1d9
This commit is contained in: