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

Change-Id: I31e8f917a78c1abcb175513360b90ff7427940c1