Merge "Magnification isn't reset when service is disabled"