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

Change-Id: Id28ab24b939f8e5ca1a234a5076611775b874257