Merge "Flip SETTINGS_ENABLE_SPA to true"