Merge "Reset common association source while resetting procstats associations" into sc-dev