Merge "Dark grey overflow in dark mode" into rvc-dev