Merge "Only stop face auth if display is off & awake" into udc-qpr-dev