Merge "Fix null pointer dereference in Camera2Client::stopPreviewL" into main