Merge "Handle all kinds of focuses and make fault tolerant to phone calls."