Merge "Disable EntityHeaderController animation for item move down issue" into sc-dev