[[ Bug 12897 ]] Fix standalone popup crash when stack has no menubar
Merge remote-tracking branch 'ian/bugfix-12897' into bugfix-12897
Merge branch 'bugfix-12897' into develop