Merge changes I98927540,I95c71e8d into jb-mr2-dev

* changes:
  Fix dump when virtual display exists
  Isolate knowledge that fb target == output buffer