am 46ab373f: am d5e345b0: Merge "Actually set the virtual display output buffer." into jb-mr2-dev

* commit '46ab373f1f394ec50e38381cb98d3976fe87a9bb':
  Actually set the virtual display output buffer.