Merge "camera2: Add height to the crop region metadata property" into jb-mr2-dev