am 5a571291: am 0c0d7d25: am 18e1486a: Remove surface from rs init and handle surfaceChanged correctly.

Merge commit '5a571291d38723cc4789bd864b24aa7009b642e6'

* commit '5a571291d38723cc4789bd864b24aa7009b642e6':
  Remove surface from rs init and handle surfaceChanged correctly.