Aperture: Properly handle QR scanner activity

* If we use changeCameraMode, we both write to shared preferences and we
  initialize camera before onResume()

Change-Id: I898e7affd393bdddec4727955a94ec8d3f13a673
2 files changed