Merge "Switch version gate for fallback linespacing to P"