Merge "Fix rare crash in bt detail panel"