Merge "Move tests from FlickerTests to WMShell"