Merge "Make backgrounds lighter in light theme"