Merge "Revert "Revert "Remove ScrimController from BiometricUnlockContr...""