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