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

Change-Id: If9f4402b7dba2efa386f4c008b9e1477b753a282