Merge "have OffloaderController store and re-push more state" into oc-mr1-dev