Merge "Update section header placement logic" into rvc-dev am: 8f034348 am: 5fddf61e am: 6a8ffaba am: d597a296 Change-Id: I87d8a549551cbdd720d162b3a321506e63cd781b