Merge "Reland: Clear transitions for app windows display change." into qt-dev am: bf4eee2181
am: c5116d9d30

Change-Id: I2018b395d7242a9a6e5e8a6b5be61e771fe2c2b9