Merge "Fix b/13624215. Update background colors." into ub-gmail-ur12-dev