Merge "Add an override for getUser in ContextWrapper"