Merge "Allow activities to be embedded within the dream" into main