Merge "Avoid stuck wake-locks" into qt-dev
am: 13775aa4bb

Change-Id: I0db38fdb7a757510f1f24d981c66b387c6596871