Merge "Add camera extension fallback toggle" into main