Merge "Move category refreshes to a deferred update"