am 859a62ce: Merge "Enforce a maximum size for action button icons." into jb-mr1-dev

* commit '859a62ce92d8d1e40a4de5c76a30540860b80718':
  Enforce a maximum size for action button icons.