Merge "DO NOT MERGE Hide UDFPS affordance when some dialogs show" into sc-v2-dev