Merge "Fix a typo that would cause us not to shutdown/flush the decoders in" into jb-mr2-dev