Merge "Avoid launching activity-based feature to force stop exist actiivty and recreate it." into rvc-dev