Merge "Tint screenshot frame black in dark mode"