Merge "Do not wake up in MODE_NONE" into qt-r1-dev