Merge "Refactoring of action bar internals"