Merge "Closes NotificationRankingUpdate fd after write" into main