Merge "Use previous valid section key of a notification that was updated to an invalid section" into main