Merge "Camera: Fix wrong wasImageCaptured flag" into sc-qpr1-dev