Merge "Clear linger timers on non DDS networks" into q-keystone-qcom-dev