Merge "Fix: Check NULL object when request to stop listening" into p-keystone-qcom