Merge "Fix problems with StaticLayout indentation" into mnc-dev