Merge "Fix face enroll introduction crash after 10mins"