Merge "Add error widget to dashboard"