Merge "Run layout when exiting window" into pi-dev am: 7f03f1a20c
am: 6b79da7a31

Change-Id: Ic846e1c3d5b5c6776503d438c2ee2c1e0f57a62a