Merge "Invert custom views in dark mode"