Statusbar : Cleanup and Fix

Change-Id: I0cb8b4572e0d39bcbab43cf7fa765c6865e67886