Merge "Make test more reliable for multi-window/multi-display area devices" into stage-aosp-tm-ts-dev