Merge "Fix breakage from ActionBar animations"