Merge changes from topic "dsl"

* changes:
  Support Android TV
  Support flicker DSL