Merge "Bugfixes in StaticLayout."