Merge "Refactoring of the screen magnification feature."