Merge "Update section header placement logic" into rvc-dev am: 8f034348 am: 1e0d831e am: 4aec25a0 am: f4cd33d9 Change-Id: Ie9e0a27dc0882a86b8572c788084f1ffbafbb696