Merge "Fix a software decoder freeze issue"