Merge "Remove parameter in onRemoved method" into main