Merge "Add a flag to control activity snapshot by default." into main