Merge "Made sure to unlock the pending unlock if the user is being switched" into qt-r1-dev