Merge "Fix magnifier appearing unexpectedly on scroll" into sc-dev