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

Change-Id: I9922c9acf40d74541557aaaaa8fabd90bb0cb195