Merge changes Id24a439e,I87e96fb4

* changes:
  OMS: fix listener callbacks triggered by changes to target package
  OMS: fix offset-by-one error when setting overlay priority