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

* commit '2ebfee16402e9a9ae631fca00806bef9233a6ac0':
  Enforce a maximum size for action button icons.