Merge "Eliminate unnecessary calls to onBufferReleased" into cw-f-dev