Bug 916660 - [Window Management] refactor app modal dialog