Merge "[ipq806x] Updated buffer reuse logic"