Merge "Revert "Camera2: create new streams if surface size has changed""