Merge "Update ServiceState broadcast for location permissions" into tm-dev