Merge "Allow the assistant activity types to be snapshotted" into pi-dev