Merge "Camera: add new default secure image size key" into sc-dev