Merge "Fix magnifier border isn't fixed when magnification is working" into rvc-dev am: d5a344ff am: eadeae79 Change-Id: I54d48c2a421c03b741e0f88a1c7abf074b427f0f