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

Fixes #6987
Fixes #6939
@cgack we are moving and modifying these lines here so lets do it the right way. No point in fixing one thing in destroy if we leave other parts ( like the padding ) completely broken.