Merge "Fix NPE for auto-bubble notifications"