Merge "Add flag for screenOff/addUdfpsView bug fix" into main