Return original value if icon info is null

If the composed icon info is null then there is not much to do so
restore the original TypedValue and return.

Change-Id: I3351af8b996125b376f5db6a9dad6d37605d69b2
REF: THEMES-648
(cherry picked from commit e99897ef)