Merge "Validate custom pointer icons aren't null." into cw-f-dev am: 05b2d3eb0d
am: 24a1667145

Change-Id: I0cff9d5dbdc4228ad8d02cd73259f60055fdb9bc