Merge "Replace usages of Context.getUserId() by Context.getUser()"