am 85b5d82f: am ddbf2a1f: am dafdc643: Merge "Fix jank in when drawing magnification bounds" into lmp-dev

* commit '85b5d82f479be359ca6ae30b9cba6ace1c5af327':
  Fix jank in when drawing magnification bounds