Merge "Add SpaDialogActivity" into main