Merge "Adding a scaling threshold in ScreenMagnifier" into jb-mr1-dev