Merge "Update surface position once created." into pi-dev