Merge "Fix jank in when drawing magnification bounds" into lmp-dev