Merge "Allow wake_lock_screen when AOD is off" into qt-r1-dev