Merge pull request #4944 from bsclifton/bookmark-settings-breakup …
Split apart "always show bookmarks toolbar" and the bookmarks toolbar display mode