Merge "DO NOT MERGE Make the disconnecting list from activity up-to-date" into q-keystone-qcom-dev