Merge "ipq6018: fixing "reset never completed issue""