Merge "[WifiKeyStore] Check needKeyStore before requesting keyStore service" into qt-dev