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