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