Merge "Fix battery percent multi-user"