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

Change-Id: I68c8a45c8bd207b82a9d82d6f2fd5c7fb85b098c