Merge "Revert "Make portrait action bar icons consistent with landscape."" into jb-dev