Merge "Revert "Prevent exfiltration of system files via avatar picker."" into tm-dev