Merge "Remove search option in Magnification settings" into pi-dev
am: f9b93310c5

Change-Id: I626e6ebf41395938abf74f004612e982a0ed8005