am 2a36497e: Merge "Stop using default value for Surface producerControlledByApp parameter" into klp-dev

* commit '2a36497e45d4d96e35fed89cfdcb09b71459ac3c':
  Stop using default value for Surface producerControlledByApp parameter