Merge "Update security status icons." into oc-dev