Merge "Revert "Clean up fully rolled out HeadlessSingleUserFixes"" into main