Fixes for Tinted Status

Change-Id: I72f53faa22773ee232e3c23be3f6c120649335fe