Merge "Fix incorrect background for change labels" into ub-gmail-ur14-dev