Merge "More robust display ID mismatch detection in IMM"