Merge "Set up environment for media smartspace user events" into main