Revert "Revert "[Remote fallback tuner] add separate enable/disable option instead""

This reverts commit 137d8d5ad1ed8036f1c0fd4135da64f5c63ece83.