Conflicts: - `app/helpers/theme_helper.rb`: Upstream removed the feature flag and refactored, while we have a slightly different theming system. Updated accordingly. - `stylelint.config.js`: Upstream removed overrides for the temporary themes. Did the same.