Merge "Change sync manager init timing back to PHASE_ACTIVITY_MANAGER_READY"