Merge "Fix bug #3248308 (On account set up, turn on sync for all apps by default; delay sync until after user selects Finish)"