Merge "Remove ScrimController from BiometricUnlockController"