Merge "Migrate UI to supportsMultipleUsers()." into jb-mr1-dev