Merge "Use target component to find existing single instance activity" into rvc-dev am: 16349cb0 am: 19ab2bd1 Change-Id: I7cc224520216701da09ddffc8b4b721767a62a72