Merge "Make window introspection tests more robust." into lmp-dev