Merge "Fix bug 5357295 NPE on display when remote control client dies"