Fix main menu animation glitches

Bug: 56391
Change-Id: Ic81d6f38b7933a62c04165d503a8d40bd31ce698
Merge "Fix main menu animation glitches"