Merge "Fix display updating for dashboards"