Allow subclassing the CaptureActivity
Merge branch 'master' into library