Merge "Use correct method for checking NETWORK_SETUP_WIZARD permission" into qt-dev