Merge changes Idf1ab608,I70f3e8dc into tm-dev

* changes:
  Prevent exfiltration of system files via avatar picker.
  Add tests for AvatarPhotoController.