Merge "Revert "ui: Refactor stable ID generation for GPU virtual displays"" into main