Merge "Multiuser love for LocationManager" into jb-mr1-dev