Merge "Switch over RemoteCallbackList to handle callbacks." into sc-dev