Merge "Re-enforce MANAGE_ACTIVITY_TASKS for applySyncTransaction" into sc-v2-dev