Merge "Improved dialog management in Settings>Users" into jb-mr1-dev