Merge "ui: Restore DisplayIdentification_test" into main