Merge "Throw an exception instead of crash when a surface does not have a binding surface texture" into jb-mr1-dev