Merge "Fixes header bar sizes when changing display sizes"