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

Change-Id: Ia6b7fa1241ff9ddd5d9291bc5737d587f433aa35