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

Change-Id: I64177384df476df99bc745914c1f61b26620880d