Merge "Fix support for rendering status icons" into pi-dev am: fad31024f8
am: dcad15b736

Change-Id: I612c31c2861e656360adaf0dd25f16f3218ddf48