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

Fixes #6987
Fixes #6939
@arschmitz here i'm constructing these class strings to keep the line length below 100. Is that not what you mean here?