Work around onFinish not firing when camera change negligible