Merge "Fix Magnification Settings didn't restore via D2D transfer" into rvc-dev am: ca83d45538

Change-Id: Ia433c7a216d18809c6392963d5221cf85d68a405