Merge "Remove unused import in DisplayContent" into sc-v2-dev