Merge "Also check idle to handle stopping activities" into sc-dev