Merge "Fix unexpected surface visible after closing animation" into sc-v2-dev