am d6a3e485: Merge "Unify normal and overlay action bar layouts." into jb-mr2-dev

* commit 'd6a3e485b58e23808b44b8f2374e67e891cfae05':
  Unify normal and overlay action bar layouts.