Merge "Hide UDFPS overlay on lockout" into sc-dev