Made Window z-indices update when windows are closed (#13174)

Change-Id: I2fa7566ec4788893d1d99440a7ca2d014c9a8f13