Merge "Make IActivityClientController oneway as possible"