Merge "Added fine-grained tracing to UserController.startUser()"