Merge "Bug 5384675: Color in add to dictionary"