Merge "Disable Virtual Display by default in SF"