Merge "ANR observed under settings when trying to reset network settings" into qt-dev