Fix for disappearing icons bug.

Change-Id: I5c23a70e4202f07082b63eabe7afe67edd0d78b3
(cherry picked from commit abb65fb5d2fd25168765ce6c02850bcd1feddfb3)