Merge "Camera2: Fix callback with old data after camera switch"