Reverts #15164, because that's fixed upstream now. Closes #15139. Reverts #15178, but also closes #15121, because that's fixed upstream. see also: * https://github.com/microsoft/microsoft-ui-xaml/pull/8430 * https://github.com/microsoft/microsoft-ui-xaml/pull/8420