Merge "Fixing some issues with our use of GridLayout."