Merge "Fix NetworkControllerDataTest fail if inflateSignalStrength is true" into qt-dev