Merge "Reset lockout for correct profile/user" into qt-r1-dev