Merge "Revert "Merge branch 'frame-parallel' to enable frame parallel decode in master branch.""