Merge "Fix StaticLayout left/right indent" into nyc-dev