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