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

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