Merge "A few small missing things from the custom action bar layout." into jb-mr2-dev