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

Change-Id: Ia63928128a95f88872cfcee1dad5f87850cc66a4