Merge "Fix Bluetooth QS tile." into jb-mr1-dev