Merge "Revert^2 "Introduce a new headless-user-mode attribute"" into main