Fix back-portable header bar positions

This reverts dbb2e0feb050d30376455d14b2af656e56686c6f and adds a
temporary fix for gtk+ >= 3.11. This commit can be reverted once we
bump our gtk+ requirement to 3.12.