Merge changes from topic "apexd-refactoring"

* changes:
  Simplify clean up of APEX on boot complete
  Refactor apex activation sequence during boot