Merge "Use target component to find existing single instance activity" into rvc-dev am: 16349cb029

Change-Id: Iac76250bb86d58c97269f729622a9a2ab1c62b6e