Merge "Fix NPE when starting advertising with null GATT"