Merge "Reset num saved networks with mac randomization before counting" into qt-qpr1-dev