Merge changes from topic "dynamic_stream_effects_master"

* changes:
  Add dynamic stream default effects
  Add helper method to convert usage to stream type.
  Update getEffectDescriptors() to include type