Merge "Make display unique id stable across x86 and x86_64 builds" into sc-v2-dev