Merge changes from topic "split_applyNewState"

* changes:
  Split applyNewState into enable/disable APN
  Removed setDependencyMet in ApnContext