Merge "Revert "Camera2: Temporarily remove surface size 0 check""