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

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