Merge "Fix enrollment preview surface leak" into sc-dev