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