Merge "Fix rare crash seen when dereferencing backgroundIcon[NONE]."