Merge "Fix bug in PolicyInstanceDialogComponent"