Merge "Update the current user id for MagnificationController"