Merge "Camera framework change required for 0-memcpy recording"