Merge "Make sure surface crop is up-to-date when moving to front" into tm-qpr-dev