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

Change-Id: Idb5f7c1222fdc6356a54da2b40f643ec91b773a8