Merge "Fix crash in Settings for secondary users" into jb-mr1-dev