Validate custom pointer icons aren't null.
am: 35068079c8

Change-Id: I37fdde3c1ea735c4888760f3aab43caf7711dd0e