Merge "Do not remove the default display during tests."