Freeze break request: backport Flatpak installation fixes