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

* commit '7dd2157ec2864815f4fb7a9e194843b2fb0d2f2d':