Merge "Hide lock icon while WAKE_AND_UNLOCK is happening." into qt-dev