Merge "Fix for layout parameter validation bug in GridLayout." into jb-dev