[#49401719] debug toolbar should not appear in popup screens
Merge remote-tracking branch 'origin/master'