Merge "Update ServiceState broadcast for location permissions" into sc-v2-dev