Merge "Fix LauncherProvider newScreenId issue" into sc-v2-dev