[automerger skipped] Merge "Revert "Settings: Add logical camera default switch"" into pi-dev am: 1db4027355
am: 7ed1343d0a  -s ours

Change-Id: Icddc5ec3a2d031c0021d4983952569b9aecb0b23