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