Merge "Multi-user battery settings." into jb-mr1-dev