Merge "Add/Remove wrap_content when converting GridLayouts"