Merge "Reset mBufferInfos for setBufferInfo(s)" into main