Merge "camera2: Increase preview frame timeout" into lmp-dev