Merge "Fix config change on secondary split adjustment" into rvc-dev am: 320ecaca3f

Change-Id: If691b5851b82cd8665f97f717402e5a692628009