Merge "media: allow test to continue waiting for complete if there's new encoder output" into lmp-mr1-dev