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