Merge "Action bar refactoring and transitions" into klp-dev