Merge "Clean up fully rolled out HeadlessSingleUserFixes" into main