Merge "Get rid of spurious gear icon in BT details page" into oc-dr1-dev