Fix for disappearing icons bug.

Change-Id: I5c23a70e4202f07082b63eabe7afe67edd0d78b3
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0