Merge "Camera: Add support for single plane stride queries" into sc-dev