Merge "Show more settings and add restrictions/dialogs for secondary users" into jb-mr1-dev