Merge "Account for unreleased frames when predicting resampler needs"