Merge "Updated highlighted text color Bug: 5217848"