Merge "Use the result of config diff to check display change" into main