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