Merge "Update behavior of setDestinationInExternalPublicDir()." into qt-dev
am: e2ce2e00ca

Change-Id: Ic6f4fb128f5b205f9d8b818c8448705799140651