Merge "Action bar refactoring, round 1"