AI-519 : make sure header width is restored after header redrawing
Merge remote-tracking branch 'origin/version3' into version3