Merge "Bugfixes in StaticLayout. DO NOT MERGE." into honeycomb