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