Merge "Handle "background sync off" off the UI thread"