Merge "RESTRICT AUTOMERGE Remove ScrimController from BiometricUnlockController" into tm-qpr-dev