Merge "Avoid launching activity-based feature to force stop exist actiivty and recreate it." into rvc-dev am: 45910eec3f
am: c8e6f9a025
am: 82b3f21f10
Change-Id: I87de0b85bb7f04010a1a66a84456b7ce090a4782
This commit is contained in: