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

Change-Id: Id568cea89401c8e78ba9b0b59c8fd7f026c031db