Merge "Differentiate between empty and unrecognizable display identification data" into main