Merge "Make operation-specific layouts, instead of passing in animations" into sc-dev