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

https://bugzilla.mozilla.org/show_bug.cgi?id=896500