Merge "Always update the surface crop when moving to front" into main