Merge "Fix display-level windowingMode change" into qt-dev am: 35940c61ec
am: 7846607324

Change-Id: Ib182ed228618cda8f6eb53baaf85b95bd283c0b4