Merge "[Magnifier-65] Separate builder defaults"