Merge "Notify split controller about activity configuration change" into sc-v2-dev