Merge "Fix 5623252 unlink to death of audio focus client early" into ics-mr1