Merge "GridLayoutManager margin bug" into nyc-support-24.1-dev