Merge "Improve error robustness in arithmetic decoder"