Merge "Tighten default inlining settings when using the space filter."