Merge "Use target component to find existing single instance activity" into rvc-dev