Merge changes I255c033f,I4269b194 into sc-dev

* changes:
  Fix udfps auth scrim state
  Lock screen a11y updates