* WIP * Core function works e2e * Queued overlays support * Remove unneeded activity ref * Add post-PR changes