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

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