Merge "Remove frozen bounds of activity and task" into sc-dev