Merge "Fix WindowMagnificationControllerTest failure on foldable targets" into sc-v2-dev