Merge "Delay syncs for idle apps"