Merge "Removed flaky annotation from testFocusedWindowMultipleDisplays" into pi-dev