Merge "Avoid stuck wake-locks" into qt-dev