Merge "Fix "always show pictures""