Merge "Use target component to find existing single instance activity" into rvc-dev am: 16349cb0 am: 0bc33836 Change-Id: Iced11677a116877e18629a1d3f116ce205269c3d