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

* commit '77a1273964b1a9810e89ba4b7bc26805eb2a97c3':