Merge "Fix launcher preview for two panel follow up" into sc-v2-dev