Merge "Migrate resuming/pausing activity to TaskFragment" into sc-v2-dev