Merge "Consistent null-checking in MediaRouter."