Merge "Revert "Finish sync for activities under a drawn shared starting window"" into main