Merge "Camera2: Adjust sensor dimensions for correct FOV." into jb-mr2-dev