Merge "Fix Magnification Settings didn't restore via D2D transfer" into rvc-dev am: ca83d455 am: 7f8eabf3 Change-Id: Ib03d5290fa43ecd3a4c7c5a7f3266dd2ab146022