Merge "Use package specific dirs instead of top-level sdcard." into qt-dev