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

Change-Id: Id6129e8cdc743ac1b95fa8f114109de155644ea3