Merge "Revert "Prevent exfiltration of system files via user image settings."" into sc-dev