Merge "Deprecate StaticLayout and DynamicLayout constructors"