Tinted: comment out navbar coloring again to fix build

Change-Id: Id77f3c810042eea5f289578fb76e8b791743b97b
Tinted: Battery color should work when statusbar isn't selected

Change-Id: I2ca8373e7a182c30dda349ff0114efc7508b0138