Merge "Camera2 Legacy: catch more surface abandoned error"