am 3f1be07f: am 6ceed12a: Merge "Fix an action bar menu order of operations bug" into jb-mr2-dev

* commit '3f1be07f0a4183ae5e48a4a33f32ed1af949b7ae':
  Fix an action bar menu order of operations bug