Merge "[Companion] Nullcheck if ListView is null"