Merge "Fix NPE when notification icon is empty"