Merge "Explicitly request clearing of external storage." into qt-dev