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