Merge "Take padding information into StaticLayout"