Merge "Effects Factory changes for effects offload" into klp-dev