Merge "Make testAddingImmersiveWindow robust when remote inset controller is used." into sc-v2-dev