Merge changes from topic 'heapbase' into oc-dev

* changes:
  DRM: more fixes for heap base mapping -- DO NOT MERGE
  Revert "Revert "Fix decoder instantiation during playback"" -- DO NOT MERGE