Merge "Use FINAL_FRAME for leaving grid animation" into sc-v2-dev