Merge "Fix bug where both list and grid buttons are visible."