Merge "Fix View padding resolution"