Merge "Fix Visibility not changing until Animator ends." into mnc-dev