Merge "Apply proper locks onto the service/association state tracking" into sc-dev