Merge "Update display contents when metrics change" into oc-dev