Merge "Abstract out common code for managing a single instance remote callback" into sc-v2-dev