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