Merge "GridLayout changes for API council" into klp-dev