[0.6] Simplify logic of CaptureAction