Merge "Pause surface position for bounds change transaction" into main