Merge "Inline notification_row_user_context" into main