Merge "Update Xbox BT controller mapping for new FW" into qt-dev