Register the activity properly and create a scoped element if the API is there.

One all bugs are fixed upstream this should allow us to switch to lit v2
without any further changes.