Merge "Send IActivityClientController to client when launching activity"