Merge "Revert "Revert^2: Use action bar style from ContactsCommon""