Merge "Fix an action bar menu order of operations bug" into jb-mr2-dev