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

Change-Id: I6dc28541e6c52de28bf22b6bb111a0f9f5dcb235