battery cluster layout changes

Change-Id: I952b79126ff92e6798ac20c5b5dff08b33a8cf99
fix custom status bar size calculation

Change-Id: I4cc05c5affbbce3f4ed448040f7a899b1d2561fd