Merge "Remove unstarted freeze surface before starting new freeze" into sc-v2-dev