Merge "Stop using default value for Surface producerControlledByApp parameter" into klp-dev