Merge "Release SUPL connection after timeout" into main