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

Fixes #6987
Fixes #6939
you only want to remove these if there is not another toolbar using them just like `ui-page-header-fixed` below.