base

Merge change 22830 into eclair

* changes:
  Another quirk, some OMX components fail to properly flush before shutdown and we must do it for them...