Merge "Camera2: Handle surface size change" into mnc-dr-dev