Merge "Simplify binderDied() method"