Merge "Update Xbox BT controller mapping to support upcoming controller firmware update"