am 78d2a07f: Merge changes I98927540,I95c71e8d into jb-mr2-dev

* commit '78d2a07f7aa598ce724664b1819db073eb0706ae':
  Fix dump when virtual display exists
  Isolate knowledge that fb target == output buffer