Merge "User management UI: take 2" into jb-mr1-dev