Merge "Convert Magnify controller to TogglePrefController" into pi-dev