Merge "Handle long delay between video frames in multi-thread decoder(issue 312)"