Merge "Remove GnssNi related code" into main