Merge "Allow audio and video flushed separately." into lmp-dev