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

Fixes #6987
Fixes #6939
you just checked if `this.options.theme` was set above I'm guessing the only reason you have this check here is because the one above always evaluates to true.