Merge "Fixing Launcher preview leaking surface and memory" into sc-dev