GridLayoutManager margin bug
am: de8a5de43b

Change-Id: Idefd953027c9aba9402be977b549d45956d634aa