Merge "Rename permission SET_BIOMETRIC_DIALOG_LOGO to SET_BIOMETRIC_DIALOG_ADVANCED" into main