Merge "Use correct progressive color on inputs"