Merge "Add wfcSpnFormats for vodafone-25" into qt-dev