Updated version of #9741 with fixes for the problems raised in #9774. I only verified that the images no longer look blueish on Linux, because I don't have a Mac. cc @osiewicz Release Notes: - N/A --------- Signed-off-by: Niklas Wimmer <mail@nwimmer.me>