Merge "Do not wrap action button text." into jb-dev