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