Merge "Update Biometric Prompt padding" into main