am f95aae25: Merge "Fix LightCycle capture NullPointerException." into gb-ub-photos-bryce

* commit 'f95aae25a6ba450b534a196f86c91c82b48a2d17':
  Fix LightCycle capture NullPointerException.