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