Merge "OMS: introduce the OverlayManagerService"