Merge "Fix test failure on WindowMagnificationControllerTest"