Merge "Add property to allow activity state sharing in untrusted embedding" into main