Merge "Avoid unwanted wakeAndUnLock mode for face" into qt-r1-dev