Merge "Wake-and-unlock imprevements" into qt-r1-dev