BatteryBar navbar fix

Change-Id: I80cc6a8c30965ee2a326ada3de31a0a7283da9e7
GC triggering performance optimizations

Change-Id: I23fbb622ae15f873774a6736f6730bd30ca716d2