Merge "Merge "Update section header placement logic" into rvc-dev am: 8f034348 am: 5fddf61e am: d7afa161" into rvc-qpr-dev-plus-aosp