Merge "Expose StaticLayout.Builder publicly" into mnc-dev