Merge "Update JNI to call captureChildLayers" into pi-dev