Merge "Merge "Fix Magnification Settings didn't restore via D2D transfer" into rvc-dev am: ca83d45538 am: 7f8eabf301 am: e5217994be" into rvc-qpr-dev-plus-aosp