Merge "Display BTH connected status correctly"