Delete StatusBar traffic color for the moment. small reorganization

Change-Id: Ie80316e7a6e7e03724ff5c492199624438c5039e