Merge "ignore buffers that's already removed" into mnc-dev