Merge "Fix Bluetooth switch status in Connected devices screen" into oc-mr1-dev