Validate custom pointer icons aren't null. am: 35068079c8 am: 4bb5848a93
am: 9b8e9a1ee9

Change-Id: I4cb3203cd3f5566e2577896781069fe2a27709e6