Merge changes Ie8d984e3,I17eed506 into main

* changes:
  Prevent running face detection when shade is expanded
  Change face auth trigger to LockScreen -> Shade transition