Merge "Update bluetooth device type icon color"