Merge "Camera: fix signalStreamFlush logic"