Merge "Fix dialog exit animation" into sc-v2-dev