am 4fa3a80b: am a5f301c7: Merge "Legacy: Only set user surface dimensions on output surfaces" into lmp-mr1-dev

* commit '4fa3a80b6cefdc500de6c7daacc7ef3e160a0543':
  Legacy: Only set user surface dimensions on output surfaces