Merge "Camera2: fix 4K recording" into lmp-dev