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

Change-Id: I77ee856726f9e3ce932115c77733c405e55a2bf9