[automerger skipped] Merge "Settings: Add logical camera default switch" into pi-dev am: 871d93a564
am: 94f80c719a
-s ours
Change-Id: I161d7bbb078320d0dbd43ed08dc13fe5791d8fa8
This commit is contained in: