Merge "Removing some animation special casing for 2-button mode" into sc-dev