Merge "Relax conditions for including windows behind dialogs" into klp-dev