Merge "UserTest: correctly reset fake time"