Merge "UI: Fix an issue where loading chip lingers if change has no tasks" into stable-3.5