Merge "Don't back up / restore non-primary users' data" into jb-mr1-dev