Make sure data is unmounted during repartition internal sd

Change-Id: I0a8180cabb9629770d0b71ab1686ec4cec1c7439
Fix battery indicator position

Change-Id: I0c89546d014399b4864707da7d9b8aafe1fe1188