Merge "Disable ActionBar usage of transitions" into klp-dev