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

Change-Id: Ice9cc30ff6e4f3048d165e346b13f51a4fcaff2a