Merge "Add more virtual display tests."