Merge "Validate custom pointer icons aren't null. am: 35068079 am: 92f7fab9" into nyc-mr2-dev-plus-aosp