Merge "Response to code review for GridLayout:"