Merge "Make listener non-nullable" into main