Merge "Update AOD battery indication" into sc-v2-dev