Merge "Move activity related operations to ActivityClientController" into sc-dev