Merge "Fix background color resolution"