Fixing some issues with our use of GridLayout.

Change-Id: Id898258b31462f47d65f0ec674786b03a4ca326e
3 files changed