Merge "Update documentation for activity flags." into sc-dev