Merge changes Ie629ca85,I378764c6 into main

* changes:
  (refactor) Move non-UI related components out of MagnifiedViewport
  (refactor) Updating the field name mIsFullscreenMagnificationActivated