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

Change-Id: If668d9f895845362e171d74dd2c3884c35bf92af