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