Merge "Use falllback animation when going back to no icon" into sc-v2-dev