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

Change-Id: I228db2d49cce8dd6cfad03e31d8e0dcc706fed34