Merge "Disable bypass if there aren't enrolled faces" into qt-r1-dev