Merge "Inline notification_row_user_context" into 24D1-dev