Merge "Fixes MagnificationModeSwitchTest flaky test failure" into sc-dev