Merge "Fix location services for all profiles" into main