Merge "BT device renaming: move edit icon and add metrics proto" into oc-dr1-dev