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

Change-Id: I8e687af7a1e5aecb43b3348abb363f6989e5d3d8