Merge "Use real gatekeeper HAT for resetting lockout" into qt-r1-dev