Merge "Update margin / corners on BiometricDialog"