Merge "Update section header placement logic" into rvc-dev