Merge "Put updatable font failure fix behind the flag" into main