Merge "Revert "Apply transformations while offsetting focused rects"" into nyc-dev
am: ef33726e14

* commit 'ef33726e1439adeb408b0ca44f0ee55042dad26d':
  Revert "Apply transformations while offsetting focused rects"