Merge "Simplify generateHeadsUpAnimation to only take entry" into main