Merge "Fix large bluetooth item" into nyc-dev