Clean up statusbar

Change-Id: I41f3dd549b9a6594a35bce11720ed1b1f10c66e0
Add local file

Change-Id: Ic8a9d991c26377b7b2c800b1a0170d74d9a2b9af