Merge "Reset splash icon when task icon is null to avoid caching incorrect drawable." into tm-qpr-dev