Merge "Fix Magnification Settings didn't restore via D2D transfer" into rvc-dev am: ca83d455 am: 75d943ca am: 152ba9c3 Change-Id: Ia2990fe6bb48d455dc724963833705a0845505e4