Merge "Fix dismissing window showing" into nyc-mr1-dev am: b29dadb939 am: 15ece4787e
am: aec5f11e69

Change-Id: I47fd5be7617a26a4e543e87998d05d0e6593867c