Merge "Properly handle memory layout of input buffer for test camera" into main