Merge changes from topic "revert-to-single-threaded-oms-init"

* changes:
  Decouple the display manager from the overlay manager
  Revert: "Init of OverlayManagerService on a parallel thread"