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