Merge "Fix confusion between `state` and `status` in overview dashboard."