Merge "Clean-up in StaticLayout"