Merge "Using SupportModesVote in Display.Mode calculation" into main