Validate custom pointer icons aren't null. am: 35068079c8 am: 92f7fab9f6
am: 94fc026afa

Change-Id: I169e6fe508fe4674c378f324edfd5298e1aaa412