Merge "Fix magnifier border isn't fixed when magnification is working" into rvc-dev