Merge "Add metrics and code change for magnification dialog"