Merge "Immediately stop running face auth if the display is OFF" into udc-d1-dev