Merge "Fix software decoder display issue."