Merge "New AOD battery indicator"