Merge "Fix FullScreenMagnificationController#persistScale for multi-display" into main