Merge "Make it clear that legacy storage is deprecated." into qt-dev