Update baselines and fix header tests

Change-Id: I9a6a6030e4aebe79aef1f1b8909cdd14f41df12a
Merge topic 'cleaner_multislice_view' into next

c9c2c70e Update baselines and fix header tests