Merge "Revert "Add WindowDecorViewHost and WindowDecorViewHostSupplier"" into main