Merge "Migrate desktop_form_factor to Launcher3" into main