Merge "Fixed Bluetooth dialog active device color" into main