Merge "Reland "Add a DisplayCapability for multi-threaded present"" into main