Merge "Add metric action for bt rename dialog" into oc-dr1-dev