Merge "Fix MarginLayoutParams resolution"