Merge "Fix dismissing window showing" into nyc-mr1-dev