Merge "Dismiss Biometric Prompt on device lock" into main