Fixed Toolbar: removing popup removes ui-page-header-fixed class

Fixes #6987
Fixes #6939
Pretty sure this is under 100 chars all on one line