Merge "Enable battery percentage config for O6/R4" into sc-dev