Merge "Don't back-off ALREADY_IN_PROGRESS syncs" into lmp-dev