Fix button sizes on Mac? Changed from Form to Grid layout.

Change-Id: Ie4321b1ed61830e2004afdcb9afcf22fc664a7f2
Merge topic 'view-settings' into next

ecf33c12 Fix button sizes on Mac? Changed from Form to Grid layout.