Merge "[DO NOT MERGE] [Companion] Nullcheck if ListView is null" into pi-dev