Merge "Fix button padding for right to left languages in SpaDialog" into main