Merge "Check isSimHardwareVisible earlier" into main