Merge "Move debug code to spa/debug folder."