Merge "Show scrimmed bouncer from BiometricUnlockCtrl" into sc-qpr1-dev