Merge "Revert "Settings: Add logical camera default switch"" into pi-dev