Merge "Marked some WM flaky tests as such" into qt-dev
am: 50e31711af

Change-Id: I1550e10b01d86d7274d648baaae8b13a700a5790