Merge "Revert "Add parameter annotations to createVirtualDisplay""