Merge changes from topic "am-be4a6431345e4a379602827ef8e681b4"

* changes:
  [automerger skipped] Merge "Re-enforce MANAGE_ACTIVITY_TASKS for applySyncTransaction" into sc-v2-dev am: b70d57a0 -s ours am: e14be8b3 -s ours am: 9b635c55 -s ours am: 4b688e65 -s ours am: 63bcc00d -s ours
  [automerger skipped] Re-enforce MANAGE_ACTIVITY_TASKS for applySyncTransaction am: 9a91f75d -s ours am: 8088e792 -s ours am: a99600d8 -s ours am: d9df7bda -s ours am: d6a5aef8 -s ours