Merge "Move NAS selection to 'special app access'" into qt-dev