Merge "OverlayManagerService: Make broadcasts/updates explicit" into oc-dev