Merge "Revert "OMS: fix listener callbacks triggered by changes to target package""