Merge "Fix AudioFocus for back-to-back notifications"