Merge "Update dependencies in policy/gui"