Merge "Fix TaskViewSimulatorTest to be independent of device it runs on" into main