CircleBattery : Fix alignment regression from RTL

Rather than distributing the padding evenly to get around RTL issues,
remeasure on layout changes.

Change-Id: Ic6f7a58bd64bf2c99f0e07edb0d8fb8cdb9aa398
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2