Merge "Prevent codec exceptions from crashing demo app." into main