Merge "RESTRICT AUTOMERGE: Camera: fix wrong signalStreamFlush call"