Merge "Face auth  not eligible if camera in use" into udc-d1-dev