Merge "Only stop face auth if display is off & awake" into main