Merge "OMS: integrate OverlayManagerService into framework"