Merge "@TemporaryIgnoreOnHeadlessSystemUserMode changes:" into sc-dev