Merge "Revert "Add a DisplayCapability for multi-threaded present"" into udc-dev