Merge "Fix WFC location privacy carrier config" into qt-dev