Merge "Prevent NPE from onQueueChanged with a null queue"