Merge "Use -1 consistently as invalid buffer idx"