Clean up camera switcher

Change-Id: I9f0495524028528ca02c7ddf94f4698d4e87af14
8 files changed