Merge "Change into SpaBaseDialogActivity" into main