Merge "Multi-user MTP." into jb-mr1-dev