Merge "Avoid split action bar when it only has one item.  DO NOT MERGE." into jb-mr1.1-dev