Merge "Fix BP face auth requiring full tap after auth" into udc-d1-dev