Merge "Fix multi user battery percentage" into oc-mr1-dev