Merge "End icon alignment early when touching down during 3 button anim to home" into main