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

Change-Id: I0d822607285c7b4405f6ef85cf06a029831e018f