Merge "Fix GridLayout to properly convert MarginLayoutParams" into nyc-dev