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