Merge "Fix Magnification Settings didn't restore via D2D transfer" into rvc-dev am: ca83d45538 am: 75d943ca32 am: 152ba9c311 am: f953adcd15

Change-Id: I4a6162e90a7710d948e334907c54acda39b53978