Merge "Fix ZOrderingTest got NPE during display creation."