Merge "Change Udfps window type to KEYGUARD_DIALOG" into sc-dev