Merge "Add back switch user test in TaskTests"