Merge "Avoid launching activity-based feature to force stop exist actiivty and recreate it." into rvc-dev am: 9933478ea0 am: 19afd28875 am: 95e3bb2262
Change-Id: Iff1736cc391727b90a6ab6a976fecd59139175b0
This commit is contained in: