Merge changes Ic0e611f5,Ic06d754e

* changes:
  MTP: Remove retry loop from MTP server code
  MTP: Compatibility fixes for transferring strings