Merge "Should keep updating BT devices event history after use is categorized" into main