Merge "Update foreground string in battery page" into oc-dev