Merge changes from topic "viewport_type"

* changes:
  Changed getViewport strategy
  Add type to DisplayViewport