Merge "Update user engaged sessions to handle multiple session per app case" into main