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