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