Merge "Split VOLUME_EXTERNAL and VOLUME_PRIMARY." into qt-dev