Merge "Update user event listeners"