Merge "Fix resolution padding glitch"