Merge "Avoid activity stopped when relaunching it to resumed" into sc-dev