Merge "Make test more reliable for multi-window/multi-display area devices" into android12-tests-dev