Merge "Updating activity/task transition animations."