am 403d7ac7: Bring back SHOULD_SYNC flag so sync groups can be edited.

Merge commit '403d7ac7d14e87ecc7df25a1fbb79649ec5ada90'

* commit '403d7ac7d14e87ecc7df25a1fbb79649ec5ada90':
  Bring back SHOULD_SYNC flag so sync groups can be edited.