Platform: NativeIconProvider -> NPE fix + dumb-aware
reviewed by @fokin
(cherry picked from commit a46d585)