Merge "Clear remove button coordinates when not enabled." into main