Bug 959962 - Set correct width based on the padding
Merge pull request #15675 from crh0716/959962

Bug 959962 - Set correct width based on the padding r=alive