Merge "Always enable draw_magnifier_border_outside_wmlock" into main