Merge "Enable Per-display support on MagnificationController."