Merge "Disable ActionBar animations pending more involved fix" into mnc-dev