Merge commit '1f42641ebf775d0438f2694876067e547a40527a' * commit '1f42641ebf775d0438f2694876067e547a40527a': special-case coordinate conversion when we are taking content coordinates to be invalidate. We need to
Merge commit '1f42641ebf775d0438f2694876067e547a40527a' * commit '1f42641ebf775d0438f2694876067e547a40527a': special-case coordinate conversion when we are taking content coordinates to be invalidate. We need to