Merge "Cleanup empty and virtual override display settings on display removal" into main