Merge "Use an Optional wrapper in TileLifecycleManager" into main