Merge "Iteration on multi-user Storage UI." into jb-mr1-dev