Merge "Revert "make FLP play nicely with multiuser"" into jb-mr1-dev