Bug 896500 - Merge old userbar into header bar in prep for new UI