[automerger skipped] Merge "[DO NOT MERGE] [Companion] Nullcheck if ListView is null" into pi-dev am: 8df7766b0b
am: 96fbbcae74  -s ours

Change-Id: I0abe900d3a5944a28162f83401458e4f4c65d53e