Merge "Add new flag to indicate UI support for multi-user."