Merge "Multi-user and WallpaperColors" into oc-mr1-dev