Merge "Don't update biometricListenState on SB stateChange" into sc-dev