Merge "Camera2: reconfigure video snapshot size if needed" into lmp-dev