Merge "Add workaround for testing Launcher3Tests" into sc-dev