Merge "[automerger skipped] Merge "Re-enforce MANAGE_ACTIVITY_TASKS for applySyncTransaction" into tm-dev am: 3d69645a38 am: b5364b0563 -s ours" into udc-dev