Merge "Update section header placement logic" into rvc-dev am: 8f034348 am: 5fddf61e am: d7afa161 Change-Id: I413b3074b16d0131dfd1a24f1d4dead3fc32d5e6