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

Change-Id: I5b27dd14530bfb5a6b35a092d77c2b0d6adddd9e