Merge "Fix layout so that all 4 buttons show on smaller screens." into nyc-dev
am: 40026e882f

* commit '40026e882fa3e5bdc897606e4cb96ed6ac1bfbb9':
  Fix layout so that all 4 buttons show on smaller screens.