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

Change-Id: I3a11e06dfe3f476b791838241bfb36e5362063ab