Merge "Prevent repeatedly resuming/pausing activities in split" into sc-v2-dev