Merge changes from topic 'heapbase'

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