Merge "Actually merge the colors for recent indicators." into main