Merge "AR/FR: Keyboard challenge takes precedence."