Merge "Switch to GridLayoutManager to support two-column layout"