Merge "Revert^2 "Add parameter annotations to createVirtualDisplay""