Merge "Add metrics for status bar" into oc-mr1-dev