am a04497d7: am 5d376860: Merge "Avoid split action bar when it only has one...
am a04497d7: am 5d376860: Merge "Avoid split action bar when it only has one item. DO NOT MERGE." into jb-mr1.1-dev
* commit 'a04497d7':
Avoid split action bar when it only has one item. DO NOT MERGE.