Merge changes from topic 'activity_view_v2-oc-mr1-dev' into oc-mr1-dev

* changes:
  DO NOT MERGE VirtualDisplay wrapper with input forwarding
  DO NOT MERGE ActivityView be gone!