Merge "Multi-user MTP, handle secondary user boot." into jb-mr1-dev