[automerger skipped] Merge "Convert Magnify controller to TogglePrefController" into pi-dev am: cd28a977ca
am: 55e51376b1
-s ours
Change-Id: I8b0c3b9ab0136fd321c32face60cdd419d8fe125
This commit is contained in: