Merge "Wake-and-unlock imprevements" into qt-r1-dev am: 4a08215328
am: c05ce8e736

Change-Id: I1fc27facbf8a698869d892410a222241356e68d1