Merge "Accept timeout from apps requesting call disconnect"