Merge "Add validation code for GridLayout.LayoutParams" into jb-dev