Merge "Fix unable to launch app again from launcher" into sc-v2-dev