Merge "Added recovery for affinities on audioserver crash"