Merge "Surface: Change OutOfResourcesException to be a runtime exception" into klp-dev