Merge "Camera: Wait for draw done before restarting preview" into android13-tests-dev