Merge "Settings for the screen magnification feature." into jb-mr1-dev