Merge "Use user context to support multiuser use case"