Merge "Make SUPL satellite message constrained" into main